Update rails to 4.2.7.1
* Update dependencies to fix deprecation warnings
* Fix BoxcarAgent specs (found by rspec warning about expecting `raise_error` without specifying the exception)
Dominik Sander
3 gewijzigde bestanden met toevoegingen van 75 en 75 verwijderingen
+ 4
- 4
Gemfile
@@ -112,9 +112,9 @@ gem 'mini_magick' |
||
| 112 | 112 |
gem 'multi_xml' |
| 113 | 113 |
gem 'nokogiri', '1.6.8' |
| 114 | 114 |
gem 'omniauth' |
| 115 |
-gem 'rails', '4.2.5.2' |
|
| 115 |
+gem 'rails', '4.2.7.1' |
|
| 116 | 116 |
gem 'rufus-scheduler', '~> 3.0.8', require: false |
| 117 |
-gem 'sass-rails', '~> 5.0.3' |
|
| 117 |
+gem 'sass-rails', '~> 5.0.6' |
|
| 118 | 118 |
gem 'select2-rails', '~> 3.5.4' |
| 119 | 119 |
gem 'spectrum-rails' |
| 120 | 120 |
gem 'string-scrub' # for ruby <2.1 |
@@ -149,9 +149,9 @@ group :development do |
||
| 149 | 149 |
gem 'pry-rails' |
| 150 | 150 |
gem 'pry-byebug' |
| 151 | 151 |
gem 'rr' |
| 152 |
- gem 'rspec', '~> 3.2' |
|
| 152 |
+ gem 'rspec', '~> 3.5' |
|
| 153 | 153 |
gem 'rspec-collection_matchers', '~> 1.1.0' |
| 154 |
- gem 'rspec-rails', '~> 3.1' |
|
| 154 |
+ gem 'rspec-rails', '~> 3.5.1' |
|
| 155 | 155 |
gem 'rspec-html-matchers', '~> 0.7' |
| 156 | 156 |
gem 'shoulda-matchers' |
| 157 | 157 |
gem 'vcr' |
+ 66
- 66
Gemfile.lock
@@ -69,36 +69,36 @@ GEM |
||
| 69 | 69 |
remote: https://rubygems.org/ |
| 70 | 70 |
specs: |
| 71 | 71 |
ace-rails-ap (2.0.1) |
| 72 |
- actionmailer (4.2.5.2) |
|
| 73 |
- actionpack (= 4.2.5.2) |
|
| 74 |
- actionview (= 4.2.5.2) |
|
| 75 |
- activejob (= 4.2.5.2) |
|
| 72 |
+ actionmailer (4.2.7.1) |
|
| 73 |
+ actionpack (= 4.2.7.1) |
|
| 74 |
+ actionview (= 4.2.7.1) |
|
| 75 |
+ activejob (= 4.2.7.1) |
|
| 76 | 76 |
mail (~> 2.5, >= 2.5.4) |
| 77 | 77 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 78 |
- actionpack (4.2.5.2) |
|
| 79 |
- actionview (= 4.2.5.2) |
|
| 80 |
- activesupport (= 4.2.5.2) |
|
| 78 |
+ actionpack (4.2.7.1) |
|
| 79 |
+ actionview (= 4.2.7.1) |
|
| 80 |
+ activesupport (= 4.2.7.1) |
|
| 81 | 81 |
rack (~> 1.6) |
| 82 | 82 |
rack-test (~> 0.6.2) |
| 83 | 83 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 84 | 84 |
rails-html-sanitizer (~> 1.0, >= 1.0.2) |
| 85 |
- actionview (4.2.5.2) |
|
| 86 |
- activesupport (= 4.2.5.2) |
|
| 85 |
+ actionview (4.2.7.1) |
|
| 86 |
+ activesupport (= 4.2.7.1) |
|
| 87 | 87 |
builder (~> 3.1) |
| 88 | 88 |
erubis (~> 2.7.0) |
| 89 | 89 |
rails-dom-testing (~> 1.0, >= 1.0.5) |
| 90 | 90 |
rails-html-sanitizer (~> 1.0, >= 1.0.2) |
| 91 |
- activejob (4.2.5.2) |
|
| 92 |
- activesupport (= 4.2.5.2) |
|
| 91 |
+ activejob (4.2.7.1) |
|
| 92 |
+ activesupport (= 4.2.7.1) |
|
| 93 | 93 |
globalid (>= 0.3.0) |
| 94 |
- activemodel (4.2.5.2) |
|
| 95 |
- activesupport (= 4.2.5.2) |
|
| 94 |
+ activemodel (4.2.7.1) |
|
| 95 |
+ activesupport (= 4.2.7.1) |
|
| 96 | 96 |
builder (~> 3.1) |
| 97 |
- activerecord (4.2.5.2) |
|
| 98 |
- activemodel (= 4.2.5.2) |
|
| 99 |
- activesupport (= 4.2.5.2) |
|
| 97 |
+ activerecord (4.2.7.1) |
|
| 98 |
+ activemodel (= 4.2.7.1) |
|
| 99 |
+ activesupport (= 4.2.7.1) |
|
| 100 | 100 |
arel (~> 6.0) |
| 101 |
- activesupport (4.2.5.2) |
|
| 101 |
+ activesupport (4.2.7.1) |
|
| 102 | 102 |
i18n (~> 0.7) |
| 103 | 103 |
json (~> 1.7, >= 1.7.7) |
| 104 | 104 |
minitest (~> 5.1) |
@@ -155,7 +155,7 @@ GEM |
||
| 155 | 155 |
execjs |
| 156 | 156 |
coffee-script-source (1.10.0) |
| 157 | 157 |
colorize (0.7.7) |
| 158 |
- concurrent-ruby (1.0.1) |
|
| 158 |
+ concurrent-ruby (1.0.2) |
|
| 159 | 159 |
cookiejar (0.3.2) |
| 160 | 160 |
coveralls (0.7.12) |
| 161 | 161 |
multi_json (~> 1.10) |
@@ -232,7 +232,7 @@ GEM |
||
| 232 | 232 |
geokit-rails (2.0.1) |
| 233 | 233 |
geokit (~> 1.5) |
| 234 | 234 |
rails (>= 3.0) |
| 235 |
- globalid (0.3.6) |
|
| 235 |
+ globalid (0.3.7) |
|
| 236 | 236 |
activesupport (>= 4.1.0) |
| 237 | 237 |
google-api-client (0.7.1) |
| 238 | 238 |
addressable (>= 2.3.2) |
@@ -318,16 +318,16 @@ GEM |
||
| 318 | 318 |
lumberjack (1.0.10) |
| 319 | 319 |
macaddr (1.7.1) |
| 320 | 320 |
systemu (~> 2.6.2) |
| 321 |
- mail (2.6.3) |
|
| 322 |
- mime-types (>= 1.16, < 3) |
|
| 321 |
+ mail (2.6.4) |
|
| 322 |
+ mime-types (>= 1.16, < 4) |
|
| 323 | 323 |
memoizable (0.4.2) |
| 324 | 324 |
thread_safe (~> 0.3, >= 0.3.1) |
| 325 | 325 |
method_source (0.8.2) |
| 326 |
- mime-types (2.99.1) |
|
| 326 |
+ mime-types (2.99.2) |
|
| 327 | 327 |
mimemagic (0.3.1) |
| 328 | 328 |
mini_magick (4.2.3) |
| 329 | 329 |
mini_portile2 (2.1.0) |
| 330 |
- minitest (5.8.4) |
|
| 330 |
+ minitest (5.9.0) |
|
| 331 | 331 |
mqtt (0.3.1) |
| 332 | 332 |
multi_json (1.11.2) |
| 333 | 333 |
multi_xml (0.5.5) |
@@ -405,16 +405,16 @@ GEM |
||
| 405 | 405 |
rack |
| 406 | 406 |
rack-test (0.6.3) |
| 407 | 407 |
rack (>= 1.0) |
| 408 |
- rails (4.2.5.2) |
|
| 409 |
- actionmailer (= 4.2.5.2) |
|
| 410 |
- actionpack (= 4.2.5.2) |
|
| 411 |
- actionview (= 4.2.5.2) |
|
| 412 |
- activejob (= 4.2.5.2) |
|
| 413 |
- activemodel (= 4.2.5.2) |
|
| 414 |
- activerecord (= 4.2.5.2) |
|
| 415 |
- activesupport (= 4.2.5.2) |
|
| 408 |
+ rails (4.2.7.1) |
|
| 409 |
+ actionmailer (= 4.2.7.1) |
|
| 410 |
+ actionpack (= 4.2.7.1) |
|
| 411 |
+ actionview (= 4.2.7.1) |
|
| 412 |
+ activejob (= 4.2.7.1) |
|
| 413 |
+ activemodel (= 4.2.7.1) |
|
| 414 |
+ activerecord (= 4.2.7.1) |
|
| 415 |
+ activesupport (= 4.2.7.1) |
|
| 416 | 416 |
bundler (>= 1.3.0, < 2.0) |
| 417 |
- railties (= 4.2.5.2) |
|
| 417 |
+ railties (= 4.2.7.1) |
|
| 418 | 418 |
sprockets-rails |
| 419 | 419 |
rails-deprecated_sanitizer (1.0.3) |
| 420 | 420 |
activesupport (>= 4.2.0.alpha) |
@@ -429,13 +429,13 @@ GEM |
||
| 429 | 429 |
rails_stdout_logging |
| 430 | 430 |
rails_serve_static_assets (0.0.4) |
| 431 | 431 |
rails_stdout_logging (0.0.3) |
| 432 |
- railties (4.2.5.2) |
|
| 433 |
- actionpack (= 4.2.5.2) |
|
| 434 |
- activesupport (= 4.2.5.2) |
|
| 432 |
+ railties (4.2.7.1) |
|
| 433 |
+ actionpack (= 4.2.7.1) |
|
| 434 |
+ activesupport (= 4.2.7.1) |
|
| 435 | 435 |
rake (>= 0.8.7) |
| 436 | 436 |
thor (>= 0.18.1, < 2.0) |
| 437 | 437 |
raindrops (0.13.0) |
| 438 |
- rake (10.5.0) |
|
| 438 |
+ rake (11.2.2) |
|
| 439 | 439 |
rb-fsevent (0.9.7) |
| 440 | 440 |
rb-inotify (0.9.5) |
| 441 | 441 |
ffi (>= 0.5.0) |
@@ -448,32 +448,32 @@ GEM |
||
| 448 | 448 |
netrc (~> 0.7) |
| 449 | 449 |
retriable (2.0.2) |
| 450 | 450 |
rr (1.1.2) |
| 451 |
- rspec (3.2.0) |
|
| 452 |
- rspec-core (~> 3.2.0) |
|
| 453 |
- rspec-expectations (~> 3.2.0) |
|
| 454 |
- rspec-mocks (~> 3.2.0) |
|
| 451 |
+ rspec (3.5.0) |
|
| 452 |
+ rspec-core (~> 3.5.0) |
|
| 453 |
+ rspec-expectations (~> 3.5.0) |
|
| 454 |
+ rspec-mocks (~> 3.5.0) |
|
| 455 | 455 |
rspec-collection_matchers (1.1.2) |
| 456 | 456 |
rspec-expectations (>= 2.99.0.beta1) |
| 457 |
- rspec-core (3.2.1) |
|
| 458 |
- rspec-support (~> 3.2.0) |
|
| 459 |
- rspec-expectations (3.2.0) |
|
| 457 |
+ rspec-core (3.5.2) |
|
| 458 |
+ rspec-support (~> 3.5.0) |
|
| 459 |
+ rspec-expectations (3.5.0) |
|
| 460 | 460 |
diff-lcs (>= 1.2.0, < 2.0) |
| 461 |
- rspec-support (~> 3.2.0) |
|
| 461 |
+ rspec-support (~> 3.5.0) |
|
| 462 | 462 |
rspec-html-matchers (0.7.0) |
| 463 | 463 |
nokogiri (~> 1) |
| 464 | 464 |
rspec (~> 3) |
| 465 |
- rspec-mocks (3.2.1) |
|
| 465 |
+ rspec-mocks (3.5.0) |
|
| 466 | 466 |
diff-lcs (>= 1.2.0, < 2.0) |
| 467 |
- rspec-support (~> 3.2.0) |
|
| 468 |
- rspec-rails (3.2.1) |
|
| 469 |
- actionpack (>= 3.0, < 4.3) |
|
| 470 |
- activesupport (>= 3.0, < 4.3) |
|
| 471 |
- railties (>= 3.0, < 4.3) |
|
| 472 |
- rspec-core (~> 3.2.0) |
|
| 473 |
- rspec-expectations (~> 3.2.0) |
|
| 474 |
- rspec-mocks (~> 3.2.0) |
|
| 475 |
- rspec-support (~> 3.2.0) |
|
| 476 |
- rspec-support (3.2.2) |
|
| 467 |
+ rspec-support (~> 3.5.0) |
|
| 468 |
+ rspec-rails (3.5.1) |
|
| 469 |
+ actionpack (>= 3.0) |
|
| 470 |
+ activesupport (>= 3.0) |
|
| 471 |
+ railties (>= 3.0) |
|
| 472 |
+ rspec-core (~> 3.5.0) |
|
| 473 |
+ rspec-expectations (~> 3.5.0) |
|
| 474 |
+ rspec-mocks (~> 3.5.0) |
|
| 475 |
+ rspec-support (~> 3.5.0) |
|
| 476 |
+ rspec-support (3.5.0) |
|
| 477 | 477 |
rturk (2.12.1) |
| 478 | 478 |
erector |
| 479 | 479 |
nokogiri |
@@ -484,12 +484,12 @@ GEM |
||
| 484 | 484 |
tzinfo |
| 485 | 485 |
safe_yaml (1.0.4) |
| 486 | 486 |
sass (3.4.14) |
| 487 |
- sass-rails (5.0.3) |
|
| 488 |
- railties (>= 4.0.0, < 5.0) |
|
| 487 |
+ sass-rails (5.0.6) |
|
| 488 |
+ railties (>= 4.0.0, < 6) |
|
| 489 | 489 |
sass (~> 3.1) |
| 490 | 490 |
sprockets (>= 2.8, < 4.0) |
| 491 | 491 |
sprockets-rails (>= 2.0, < 4.0) |
| 492 |
- tilt (~> 1.1) |
|
| 492 |
+ tilt (>= 1.1, < 3) |
|
| 493 | 493 |
select2-rails (3.5.9.3) |
| 494 | 494 |
thor (~> 0.14) |
| 495 | 495 |
shellany (0.0.1) |
@@ -514,10 +514,10 @@ GEM |
||
| 514 | 514 |
spring (1.6.3) |
| 515 | 515 |
spring-commands-rspec (1.0.4) |
| 516 | 516 |
spring (>= 0.9.1) |
| 517 |
- sprockets (3.5.2) |
|
| 517 |
+ sprockets (3.7.0) |
|
| 518 | 518 |
concurrent-ruby (~> 1.0) |
| 519 | 519 |
rack (> 1, < 3) |
| 520 |
- sprockets-rails (3.0.3) |
|
| 520 |
+ sprockets-rails (3.1.1) |
|
| 521 | 521 |
actionpack (>= 4.0) |
| 522 | 522 |
activesupport (>= 4.0) |
| 523 | 523 |
sprockets (>= 3.0.0) |
@@ -534,7 +534,7 @@ GEM |
||
| 534 | 534 |
ref |
| 535 | 535 |
thor (0.19.1) |
| 536 | 536 |
thread_safe (0.3.5) |
| 537 |
- tilt (1.4.1) |
|
| 537 |
+ tilt (2.0.5) |
|
| 538 | 538 |
tins (1.10.1) |
| 539 | 539 |
treetop (1.5.3) |
| 540 | 540 |
polyglot (~> 0.3) |
@@ -662,17 +662,17 @@ DEPENDENCIES |
||
| 662 | 662 |
quiet_assets |
| 663 | 663 |
rack (> 1.5.0) |
| 664 | 664 |
rack-livereload (~> 0.3.16) |
| 665 |
- rails (= 4.2.5.2) |
|
| 665 |
+ rails (= 4.2.7.1) |
|
| 666 | 666 |
rails_12factor |
| 667 | 667 |
rr |
| 668 |
- rspec (~> 3.2) |
|
| 668 |
+ rspec (~> 3.5) |
|
| 669 | 669 |
rspec-collection_matchers (~> 1.1.0) |
| 670 | 670 |
rspec-html-matchers (~> 0.7) |
| 671 |
- rspec-rails (~> 3.1) |
|
| 671 |
+ rspec-rails (~> 3.5.1) |
|
| 672 | 672 |
rturk (~> 2.12.1) |
| 673 | 673 |
ruby-growl (~> 4.1.0) |
| 674 | 674 |
rufus-scheduler (~> 3.0.8) |
| 675 |
- sass-rails (~> 5.0.3) |
|
| 675 |
+ sass-rails (~> 5.0.6) |
|
| 676 | 676 |
select2-rails (~> 3.5.4) |
| 677 | 677 |
shoulda-matchers |
| 678 | 678 |
slack-notifier (~> 1.0.0) |
@@ -697,4 +697,4 @@ DEPENDENCIES |
||
| 697 | 697 |
xmpp4r (~> 0.5.6) |
| 698 | 698 |
|
| 699 | 699 |
BUNDLED WITH |
| 700 |
- 1.11.2 |
|
| 700 |
+ 1.12.5 |
+ 5
- 5
spec/models/agents/boxcar_agent_spec.rb
@@ -44,17 +44,17 @@ describe Agents::BoxcarAgent do |
||
| 44 | 44 |
|
| 45 | 45 |
it "should raise error when invalid response arrives" do |
| 46 | 46 |
stub(HTTParty).post { {"blah" => "blah"} }
|
| 47 |
- expect{@checker.send_notification}.to raise_error
|
|
| 47 |
+ expect { @checker.send_notification({}) }.to raise_error(StandardError, /Invalid response from Boxcar:/)
|
|
| 48 | 48 |
end |
| 49 | 49 |
|
| 50 | 50 |
it "should raise error when response says unauthorized" do |
| 51 |
- stub(HTTParty).post '{"Response":"Not authorized"}'
|
|
| 52 |
- expect{@checker.send_notification}.to raise_error
|
|
| 51 |
+ stub(HTTParty).post { {"Response" => "Not authorized"} }
|
|
| 52 |
+ expect { @checker.send_notification({}) }.to raise_error(StandardError, /Not authorized/)
|
|
| 53 | 53 |
end |
| 54 | 54 |
|
| 55 | 55 |
it "should raise error when response has an error" do |
| 56 |
- stub(HTTParty).post '{"error": {"message": "Sample error"}}'
|
|
| 57 |
- expect{@checker.send_notification}.to raise_error
|
|
| 56 |
+ stub(HTTParty).post { {"error" => {"message" => "Sample error"}} }
|
|
| 57 |
+ expect { @checker.send_notification({}) }.to raise_error(StandardError, /Sample error/)
|
|
| 58 | 58 |
end |
| 59 | 59 |
end |
| 60 | 60 |
end |